LPS-10988 Pass in ClassLoader
LPS-10988 Regenerate