Updated Client Framework to work with the Refactored Common Framework