Create Entity Types. GR improvements