Refactored vocabulary object