Feature/enhanced process management