Class update

Few things changed for use in PS API. Nothing major, just variable reformation