Updated for 0.9+