Improve flexibility of the loader