Change for Gradle-only setup