Cleaned up the resource loader interface