Compatible with Beta 1 (0.8.6.x)