Updated for Errai 2.4.2.Final