Made ready for Gradle