Use versioned objects for Container objects

Use the versioned infrastructure for Container objects

Change-Id: I84df8f91bd022e4c69a2a65bc68c33ad63205e9e