Process builder refactor