Added draft support