Implemented mappers, updated model