Integration with mainline