Update Entities (added queue entity and tracker)