Exercise 3.5 added postgresql