added possible tracking informations
added attributes to entity