refactor MOC creation