Updates Fix

Hosts addresses database implementation, to minimize the PC movement
impact.