Updated to use external body-parser