Added arguments to callbacks