Added named mappings functionality
Added named mappings functionality