Explore ioc refactor for list query