Use entity as parameter instead of uuid to avoid conflicts with