Align with the latest changes in the frameworks. Ditched metaprogramming in Loader implementation.