Upgraded to new gradle plugin