Added data and db export