Fixes for several problems

This PR contains fixes for:

1. Object awareness
2. Baseline caching (temp fix)
3. UpdateContainment sends only when needed.