Added new refactored boilerplate client code