Added tags and classes