Updates for Compass 1.0