Data storage for dibi

also comments