Checkin for refactoring HIT access methods