Refactoring the 317 client