More work towards configurable components.