Feature/performance improvements