Express 3 -> 4 & Update code