Added support to classes