+ Renamed parameter names to entity