Fix adding custom classes