Feature parity with original template.