Improve fork hanlding
add queue samples