Added compass support