Restructured to work as Compass extension