Update for wintersmith 2.0