switch back to object for server registry, introduce decorator for client data formatting