Added ONO framework