Added support for MB diaries