added mapping class