Fixed ClientController to use new references