added mapping to sets