Updated Use Case Model