Upgrade to compass 1.0