Added mapper, model