fix: modifined classes