Changed mappings to code format