Refactor, add date dimension to downloads