Refactor for integration
Refactor for integration build