Feature/813 postgres v2