BS-10712, enhance the loading of class + call the api with the class name instead of the script name