Support all LDP container types

https://www.pivotaltracker.com/story/show/81411416