Added plurals to fix entityobjectstore