mapper and model updates