Added some more efficient asset loading code