Added table alias support