Update loader
Update utility files