Fixing mapping
More mapping