Updated serveral classes (PHP5 inheritance)