Moved functionality into Process