Update to support templates that look like interfaces