Remove Pcat definition and these definition should be put into module itself.