Adding tags support.