added mapping classes