QuerryWrapper changes