Moshe refactor riemann prefix feature