server-node: Better extendability