added detail to the entities as per Satra's suggestions