Fix sclass structure