added support for self generated tags