Feature/john/change conversion storage to dict

Update the app