Update to h2-11, refactor Frame and subclasses to remove duplicated code