Upgraded functionality of client