Upgraded for grails 2.3.5