Added some classes (for Self-documentation)