Refit to use Payd lib