Feature/expand or replace date range