Adding support to 'Select *' queries