Moving to date based hierarchy