Added back hard coded mappings for now