fix: refactor models and fix bags in report parser