Change Tosca structure