Added support for compass