Improved requirements checking