Code refatoring, Channel request handling added