Adding more codes for client