Loading performance improvements