Updates to Fine parsing