Added ConstructEditorStore to cleanup statics
Deletion fix
MapConstruct requires KeywordExpressionPairConstruct (CMD+P)