Implemented draft functionality