Client functionality added