Reordered use cases for more logical application flow