More work on ForgeEssentailsMain:#548