Deprecate existing ones. Add new one.