Updated templates to match data