another generic change for extensibility.