Rework backend client