Coordination improvements
Custom Boundaries