Added ISBN + tests
Listener now ensures indices