Refactor base, production, manage