Updated for new gradle version