Adding forking functionality