Added some stuff and updated ContentManager::Load