Updated to support grails 2.3.x