Added tags capabilities