Add create date range and other minimal changes