Use Loader and simplify
2.0beta3