Fixed MenuComplex entity and appropriate classes