Additional tags and lint