Added arguments to callback functions