Modularization - automatically inject WCI dependency