Changed client to use a map for the signature props like the server does