Added support for NDC and markers
Support for timeouts (TCP and Redis)
Added support for NDC and markers