Updated for current gradle etc