Updated to support latest habitat 0.5