Refactor base.