Modified loading class