Updated to Gradle