Finish move to postgresql