Finishing logic with HashMap initialization. (added fixes to work with TableDEF class)
Merge origin/master