Solution fix v2, new process classes added