Updated Use Case