Update to work for new gradle