This change should eliminate the need for the enrich method in Application.
This change should eliminate the need for the enrich method in Application.