Moving stuff away from StandaloneServer