Loader refactor.

Loader refactor.