Update Gradle Plugins and Wrapper
Consolidate Handler code