Add reports and new generators