fix bugs, add structure support