Add draft ListHandler