Move third-party vocabulary to separate class