Updated period classes, easier to manage