Adding more types and config options.