Add profiling
Improve responsiveness