Large scale rearchitecturing, yet again.
Adding deleted fiels