Adding Compass support