Added EntityDef to scala defs