Refactoring periodic wrappers