Updated DB Structure and calls