Passing ServerValueHolder instead of individual values

Not debugged yet