Exchanged the dictionary to a callback parameter format