Migrated to new gradle plugin