Aded some class-administration stuff