Updates to support config of DB values