[POC] Refactor activity provider