Changed the Client to Use Common Framework Lookups