Updated the use-case