Changed the API for the label loading a bit
Finished the API change