did some refactoring and updated RunContainer impl.