Added with optional param & added send mail