Modified DDL code to match report