Finished Load refactor and performance optimization