fixing generic classes and Usuario classes