Added draft functionality