REFACTORING: hide amalgame:includes behind stragey api