Use proc_lib instead of custom machinery