Added handling for draft content