Added namespace omitting for PBC