Added new changes to hosttracker

Change-Id: Ib51f46111f69a887d752c96a9b4f69893a49a762
Signed-off-by: André Martins <aanm@ua.pt>