Update slot/container models; untested