Allow more tags, add an override class