Updated account template