Added structure stuff.