New version.

Fixed issue when passing multiple entities