Updated to include gradle plugin