Changed to an injectable module