Add a process manager class abstraction
Make some minor change