Converted to use Gradle