Feature/multiple classes