- Various performance improvements