Added a resolve_row option to the FK resolver