Much updates
Fix
Working on data dictionary implementation