Added support for OO programming (w00t)