enhancement/245/server-side-update-functionality