Updated DB Creation