Updated for love 0.9.0