added mapping logic