[#60] Added draft