Added all advanced classes