Add Fork detection