Updated PoliteLoader classes