Adding Query interface to support backward compatibility