Performance improvements. Added vocabulary normalization.