Updated doc blocks
Updated DB structure and data dump