Removed need for template arguments with each/entities