Addes these and that plus implemented tag class