Updated to split 0.5.0