Minor configuration changes && Vocabulary model