Added more LDP support.