Feedback Support; Tests; Databit Factory; Some Refactoring