Updated DB script and DBManager