Adding tag based table for data sources