added tags and type