Added new and commented mappings