Added backwards compat code