Updated DB connection and context