Minor changes on State

Add Server state and Client state