Updates

Fixed update of entities, moved messages to data service.