Added support for gralde 1.11