[ADDED] New Menuelements
[ADDED] New enum elements
[Changed] Class structure