Feature/vp 206 refactoring backend components