Add more client functionality