Update with changes from spwhc template