Moved expression editor to mixins