Added parameters check
Refactored requests