Add preloader
Refactoring