readded support for GW, ESP and ICDAR11