revised charge module according to new database schema