Added recoverypath parameter