Updated to support the latest Glaukaba commit