Phploc improvements