Improve echodoc support