Added account template overrides