Updated some method to help reduce the amount of data returned by the connection scoping