Bring Layered Groovy up to date with Hydro