Add support for custom entity index names
Index node IDs correctly
Handle the case of commit() with null batch