Update for Wintersmith 2.0