Updated with DB connection included