Moving more methods to Period