Collect imports during definition phase.
Removed imports from resolve/use.
Fixed incorrect strategy parameters in import retrieval.