Refactor for live use-cases