XPO Plugin - the Fields class should be declared as Shadows

Hi!
In an project i use a base class for all my xpo classes that contains fields like CreatedBy,ModifiedBy etc.
All my dadaclasses inherit from that baseclass. Now i want to make use of the new simplified criteria syntax.
I added the embedded Fields Class to the base class and also to my data classes.
That does not compile becaus
class 'Fields' conflicts with class 'Fields' in the base class 'XpoBaseStd' and should be declared 'Shadows'.
I don't like to put the fields of the baseclass in my data class? And what is if i later inherit from the current dataclass?
Any way around that?

Wolfgang