Improve colon in mappings