Add MainServer implementation