Improved some structure related stuff