Start of Knockout refactoring