Improved Server API