updated to new mapper and model manager