Work on MOC extension