Integrating with main project