Migrated to PHP 5 OOP