#6 Improved structure of feedback related classes