Improve Statement Query Struct.