Added knockout support