Added model mapping