Fixed deprecated classes in 1.5.1