Merged in the updated requirements class