Flatening - null at intermediate level bug fix
Recursive structure mapping bug fix
TODOs and test structure update