Added super entity to Tag for more test coverage