Added menu classes and module