[ES] Changes in Easysetup for spec compliance.