Implemented the new code base using mapIT