Fixed adding multiple classes