Some fixes + Request Handler
Some fixes + Request Handler