Improve server param parsing
[DEV-165] Add high water mark (hwm)