Adding support for Compass