Use unicorn server
Refactor loader