Update to support latest HTMLbars