Synced with latest Scalagios API changes