Partial GeneralUseCaseu update

Updated the use cases, will need to update related features with
usecases.