Refactor series model