Addition of a few classes