Added new functionality and new DB structure

-//-