* Db lookup optimization
* Getting more information from diff, introducing intermediate structure.