Modify responses and user controller