Changed templates and account structs.