Updated DB creation procedure