added auto-mappings