Update Class and methods