Minor mods to demonstrate mdb functionality