Added a global formatter for date and numbers
Added data storage