Added proper table handle support