Added container objects support and Object class