Reworked use cases and requirements