Started: adding DB/PG features