Added 3.0 support