Fixed Handler issues. Also renamed Handler to Callback.