Updated; rename loader class