Updated base Server integration