udpates for new DB-layout