Change Handler to abstract class

Fixed a few abstraction issues.