add control containers and context as per previous setup