Updated for 1.7.x - uses some unmapped names