More updates to add class + Script v25