Added the basic classes