Further integration improvements.