Added complete/fail blocks to request wrapper
Refactored request wrapper.