Made loader static
Modifications missing from previous commits