WIP refactor for paid version