report generator model structure modified