Adding tags implemented