Updated the reqdef to allow for class extension and returning