Added everything needed for Gradle support