Move requirements check to helper class