Added container aware trait to cut down on duplication on applications