Updates to fix issue related to process service