Use entity builder