Use Config instead of globals

Change-Id: I115f9c81297c507b9ebb483e62fb216de8174878