Move HintField to new class