Period scopes refactor