Add components that needed
Correct a little bug in Client.py