Console: Loader code refactored