Add more features to Server