Added more custom gamemode support