Added OO framework.