minor refactoring, adding support for handleMOJO
merging changes