Commiting this with changes to the UseCase diagram