Added support for date range + expenses