Updated templates to reflect new framework classes