Added updated feature with mail_sent field