REFS #56 TagEntity added

Change-Id: Ib29f5367f35a420929f18093214015952dc7e233