Add menu file and class declaration
improve