Features/refactor waterfall backend