Refactor time/period calculations to store them in appropriate fields in procedure objects