added entityTag and Tag entity