Changed build process to be mojn aware