Refactor preloader extension