Added multiple classes, error class, etc