Started adding back in ZEA support.