Implemented Grischa's suggested change for the new REQUIRE_* attributes