Enhanced backwards compatability for onSuccess