Moshe refactor riemann prefix feature

Prefix ""