add; tests, 0.8 support