added mapping tables