Made requirements consistent with use cases