Request handler removed from library, and some improvements done on the code as well.