updated model, added mappings