1. Add indexes to speed up queries
2. Imprive domain cycle test

Resolves #13