Added support for MOCL