Add class variables to Navigator