Added auth doc and more query conditions