Refactored collections.
Vocabulary field updates and persistence fix.