Moved to using drafts instead of custom prop