Trying to add voltage table support - revised