Improved profiling