Fixing top level entity scan to pick up both elements and complexTypes