Adding client and additional functionality