Add somewhat structured requires