Adding id to separate different kind of request.

Cleaning up.
Added some logging