Synced with Scalagios API changes