Updated DB schema