Edited generator class.
Changed database class to support new logging method.