Added profiling support