Updated for 1.6 and extended mod class

Thanks to Vswe