Adding draft functionality