:lipstick: Refactor for easier extension