Refactor for pre big data: collections decoupling.