Updated to Valencia 0.6.0