Few more integration improvements