Improve tags support