Server side refactor, second batch