Updated ContactController/service