add missing Map object, also move to the right place