Removed hard coded mappings