Add compass infrastructure