Changes to support Mettle