Added better gradle build