Add user management
Make sure custom parameters gets passed to query for collection.all
Merge with master