removed $all operator and array indexes
added Connection and namespaces