Further improvements for Base.class.php