Updated gradle integration