Move to standard PHP class refs #42