Updated to match server implementation
Update examples
Use collections