Modify graph access to handle_type, add efsm