Refactored Monitor Mapper & Account Mapper