Further reduce connection to DB