Updates to control sample definition