Improved build.gradle