Initial performance improvements