Fix bug with single instance landmarks
Minor namespace modifications
Add first pass at Bootstrap role mapping