Refactor ServerInstance model