Updated to support wintersmith 2.0 new architecture