Refactor procman handlers

m8