Adding some process handling