Updated to support changes in Glaukaba