Added container type property. Fixed selection property.