Added handler for adjusting function behavior
Added thread property in storage object