Updated the client to use structures instead of objects