Added Features to classes