Add range support methods back in