Updated class to conform to the new standard