Updated content loading code