Add feedback in front-end and back-end