Better refactory!

Added the layer to manage Delta updates [WIP]