Updated Emmamodel sys component & editing blocks