- add support for server scalability
- minor code optimization