Moved current loaders into a common assembly