Add "tags" column and generate better/prettier code