Added config to the server
Merged with amit's code