Fix: no required class for not mandatory fields