Changing structure, adding tag directive