Added 2.X compatibility