Adding support for tags and add sql that populate the table