Bug 437195: Enable multiple datums persistence

Change-Id: I2b227fd67d4045a2b11f3c532d80ff253c7bcc7a
Signed-off-by: Yasser Aziza <yasser.aziza@gmail.com>