Added info on entities