Implemented the load callback (wasn't working before)
Renames and refactors