Migrated to groovy