Added in 12 new classes, 2 are for safari support