Solved minor structure issues