Fixed inheritance hierarchy so entity fields get copied.