Enhancements in build.gradle