Updated to use Vane 0.6.0