Add enforcement of sample site selection