Following phpvms developments