Rework some vocab load functions