Extending Query interface to support backward compatibility