Updated gradle support