Added possiblity to create control groups