added tags and types table