Added < 2.2.0 menu support