Added custom tag saving