Modified the theoretical use-cases