refs #489 - improved ws templates