Model has been updated so it includes the 'container-type' in all the cases where it is needed.