Doc comment fix and added container aware trait