Updated to pure 0.5.0