added bp memory multimap structure
AGAIN. Merge branch 'claudia'