added possibility to specify any river options