Updated gradle setup