Added support for end_date