Improve code and allow process names