Fixed namespace issue
Added support for new requests