Upgraded for Gradle