Fixed Model mappings.