Added and updated for clases