Resolves one point from #102 :
This MR is a prerequisite for further roughness refactoring issues listed in #102.