Updated to work well with 0.5.0 leipzig.