Added support for multi-user values.
Fixed build errors.