Update for jojoserver :)