Moved custom mappings out to seperate file