Refactor ServerSpecific to be more generic