Moves currentField property setting to delegate class