Yes, I will move the application configuration builder creation into the domain.