Feature/convert to postgres