Updated interfaces to pass around structs including line and col numbers