Adapt to new DB structure