Update template and doco