Added Compass support