updated mappings with clear functions