Added container and moved composite back to generic.