#19 Improved requirements check mechanism.