Nicer requirements handling