Some refactoring in MonoEngine