Refactoring the GBClient