Improving gradle build.