Fixed tosca models and updated policies