Added two more data structures to Advanced window