Now with more backwards compat.