Add mappings to make life easier