suffix Trait and add container factory
templating docblocks