Updates for PR, and updated isKineticClass to be flexible