Adding support for fields, limit, skip and sort