Added support for attribute requirements