Updates to work with revised Mathmatica interface