added handler factory and corrected specs description