Update models to take advantage of container < slot hierarchy