Updated templates to be more consistent and extendable