Removed expensive call from UI thread
Added more tracking events