Got rid of facade methods in ObjectContainer