Updated for new jssor update