Changes only for profiling, will be removed subsequently