Adding current tracker

Change-Id: I510b6c3754e31a69a3c0934e22d0f3f84766aed9