Removed redundant __AbstractMarshaledEntity class