I am using tags for now but want to find a nicer way cause I always miss something