adding additional container parsing