A few more refactor changes to make things more pythonic e.g. changing
HandlerInterface to BaseHandler