Added support for ko and mvvm