BS-11624
Add refactoring and clean databinding