Minor Server refactoring
Multicall support