Further improve structure