Update to Compass 1.0 & Refactor