More changes to migrate to CodeIgniter