Move full PHP implementation into an addon