Refactor validity dates to model