Updated class definition based on Jason's report