Refactor of loader started