improved parsing ddl file