Added MenuClass and ConflictsChecker improved