Adding more components to the unloader.
Code cleaning.