updateRiver implemented

* Also changed River model properties to objects instead of primitive
types for boolean, int and long.