Move collection initialization to hook
Test / fix collection changes and index updates