Rebuilding time-validation