Fix Container as model and added template to tags