Add other processes, refactor