Reworked extended tags with classes