Use new structure system.