Updated docs
WIP data abstraction