Fixed container initializers and added decorator functionality to them.