Was improved Entity Generator, and Native Query