Moving towards completion of container classes