Removed hard-coded mapping