improve scaffold entities wizard