improvemnts for system and paypal adapter