Updated to new JSON/DB-structure