[IMP] Improved template to see effect of container