Waiting and file handler classes now extend BaseHandler