Added an API method to the Container
Renamed local variables