Add support for auto configuration - select container type and separate discrete properties. See gh-9055