new support for structure usage instead of client