Fix issue with symbol storage tracker
Adding storage aware encoder