Structure imporvements.
TODO