added Add/Drop classes functionality