Adding preparation of tracking table