Enhance requirements support