Updates to SENDO for compatibility