Changes from the gradle template