Another performance improvements