Improved link/frame extraction