Working for integration
Integration improvements